From: Keir Fraser <keir@xensource.com>
Date: Mon, 24 Sep 2007 14:38:52 +0000 (+0100)
Subject: xenstat/xenstore: NetBSD fixes.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14937^2~33
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=d1729249ef61b781bcb18006d0c34fcd772e46bb;p=xen.git

xenstat/xenstore: NetBSD fixes.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
---

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index ed359a6ded..69cbf2fca7 100644
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -31,6 +31,7 @@ SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so
 OBJECTS-y=src/xenstat.o
 OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o
 OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
+OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
 SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
 
 WARN_FLAGS=-Wall -Werror
diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index 92d4eb217a..755e322f56 100644
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -28,7 +28,9 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
+#if defined(__linux__)
 #include <linux/kdev_t.h>
+#endif
 
 #include <xenstat.h>
 
@@ -938,11 +940,12 @@ void do_vbd(xenstat_domain *domain)
 
 		vbd = xenstat_domain_vbd(domain,i);
 
-#ifdef __sun__
+#if !defined(__linux__)
 		details[0] = '\0';
 #else
-		snprintf(details, 20, "[%2x:%2x] ", MAJOR(xenstat_vbd_dev(vbd)),
-		         MINOR(xenstat_vbd_dev(vbd)));
+		snprintf(details, 20, "[%2x:%2x] ",
+			 MAJOR(xenstat_vbd_dev(vbd)),
+			 MINOR(xenstat_vbd_dev(vbd)));
 #endif
 
 		print("VBD %s %4d %s OO: %8llu   RD: %8llu   WR: %8llu\n",
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index a754fab85f..adbe605675 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -25,6 +25,7 @@ XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored
 
 XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_linux.o
 XENSTORED_OBJS_$(CONFIG_SunOS) = xenstored_solaris.o
+XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_netbsd.o
 
 XENSTORED_OBJS += $(XENSTORED_OBJS_y)